- Cosmetics: renamed and reordered functions, variables,