clean-up, optimization, adding a new player system