Cleaning up indents and other code