Remove extraneous objects and fix some indents