Improve 'end'