Clean up code to to meet current coding standards