Some indentation fixes and comments added