Some cleanups in new drawing mini lib