Remove some extraneous code, tidy up indents