cleaned up a few spots