indentation fixes and comments