code cleanup

commit