Should have fixed obvious style issues