clean project, refactoring code
merge branch to locally