changed format to match my usual preferences, basically what flux uses but 2...

changed format to match my usual preferences, basically what flux uses but 2 spaces and no space before perens.  Also allows single-line functions, since that's a useful pattern for methods that is commonly used in this codebase.