Improved indenting and comments