Some refactoring of main logic
Merge branch 'master' of https://github.com/mkadlec/HauntedCemetary