Refactor play controller and view