More tidy up and better tooling