Refactoring player controller
finished refactoring of player controller and player