Refactor landing head and application head