minor tweaks, + style guide