add player enum, clean up code