Clean up identation etc