Air dates fix + code cleanup