Remove unnecessary brackets at the end. Also re-indent cleanly