code cleanup p3