major code style revamp
Merge branch 'master' of https://github.com/ricardovegas/fromonetoten