Simij,Mansi | #45 refactoring