Clean up code

Fix code to standards