code refactor
code cleanup