Indent and clean up a few things