Minor refactoring.
Merge branch 'master' of github.com:pauldb89/worm
Merge branch 'master' of github.com:pauldb89/worm
Merge branch 'master' of github.com:pauldb89/worm
Merge branch 'master' of github.com:pauldb89/worm