Uncuddled braces

and moved private helpers to the bottom of the class