Tidy up code more.