Code review, making some minor changes.