cleaned up a few nits