Code comments and indentation refactor