General Tidy up and slight restructure