syntax cleanup
test and CI cleanup
Merge pull request #32 from phlipper/cleanup

Cleanup