Merge pull request #90 from gavinlaking/twerks

Refactorings.