Formatting fixes.

Making things consistent, clean, etc...