Indents and comments added