Refactoring
Feedback giving working from student side