Refactoring student

:large_blue_circle: