pocket code cleanup