code cleanup cont