clean up code style, indentation, spacing etc...