Cleanup comments and indentation