tidy indentation and obsolete braces