code cleanup
refactoring cont.