Whitespace and code formatting;
White space, code formatting improvement;
Removed variables which shadowed others (either global or class);