clean up
refactoring,cleaning