cleanup - simplify code