Cleaned up a few more pieces.