Cleanup main methods.
Merge branch 'master' of https://github.com/fru/torsion.git