Functional gliding before code cleanup