refactoring and minor style improvements
Merge branch 'refresh' of https://github.com/zooniverse/Cyclone-Center into refresh