Clean up whitespace & syntax