Raven's (minor) changes.

Mainly readability issues.