Refactor Turn and User class