More tidy up of code.