Merge pull request #68 from fyfe/spring-clean

[WIP] Spring clean