Tidy Up the Code...