removed few refactorying