Cleanup, scientific numbers, layer mapping