code cleanup begins