start code cleanup