I try to tidy it up a bit with a bit of help