extract methods
Merge branch 'master' of https://github.com/jasperblues/Typhoon