cleaning up code
Merge branch 'master' of https://github.com/kuiro5/Dynamic