Fixed indents and comments