refactoring
Merge pull request #10 from SuperTux88/refactoring

refactoring