Fix some code to respect standards.