Refactor student