Upgraded to 0.4.x and a nice tidy up while I am in there