Cleaned up some code but not all

Selected game objects code is still really messy and poorly implemented