Cleaned up file.
Misc style cleanup.