Indentation 4 spaces and some code cleanup