refactoring
refactoring, cleanup