code cleanup

aaa