More tidy up