Tidy up machine selector