refactorig some file