Slightly refactored the game engine

Small amount of changes