More tidy than before