cleanup
Merge branch 'master' of https://github.com/eranpeer/FakeIt
cleanup code