Indention fixes and extra comments