Cleaned up Input and Game classes