code cleanup in the melee controller