cleaning up code a bit, staging the play controller