Let's just tidy that up a bit