Additional style tweaks and refactoring #57