Some more minor cleanup
Merge pull request #57 from seavor/polina

Some more minor cleanup