Game controller tidy up