^ code cleanup