Fix indentation

Fix indentations and pretty up comments.