Tidied up because someone is going to be LOOKING at it