deleted unnecessary code
refactor