Simij,Mansi | #47, refactoring