Cleaning up a bit more...

A few more cleanups.....