Fixing indentation and removing comments