cleaned repo
refactoring