Tidy up and make things a bit more clear