addressing #6.
just some cleaning up.