Indents and updated comments