variable name-changes, formatting, commenting