Small refactor
Merge branch 'master' of https://github.com/calebwang/spectacled-porpoise