refactoring
Merge pull request #12 from SuperTux88/refactoring

refactoring