cleaning
change property wip
renaming