Refactor minor stuff
Add GameObject