lo2y4 code cleanup