code refactoring
code cleanup