conform to the style guide

except for brackets after functions