Fixed indenting and comments