Refactored a bit and introduced LibGDX