Move line return to template