refactoring + removing un needed row