#POULPE-452
Done refactoring based on code review notices
Fixed failed tests