GameObject updated, some code cleaned up