Cleaned up a few more minor bits