Cleaned up code a bit in GameObject