Cleaned up a few more places