clean up code [c23128d9712aeb86938d29c2bceb840dfcd122df]