^ code cleanup for layout builder