Some minor style changes, fixes #19