some refactoring for slimming it down
Merge branch 'master' of https://github.com/OutThisLife/Financial-Freedom