Code cleanup.
Merge branch 'master' of https://github.com/maniartech/framework-factory