Lint fixes, closes #35.