Clean up duplicate editor result alignment code
Update behavior var names for consistency