code cleanup cont.