style and formatting fixes, issue #5