Curly Brace Standards + Cleanup