Remove whitespace & adjust indention