refactoring
clean up
move statement