coding standards cleaning 2