renaming
refactor, remove junk