cleaning up and minimizing a bit.