Much tidier.  Done.