Improving whitespace and variable names