Fix indenting and clean up