Code formatting

- Ran files through code-utils/stylize.php
- Re-indented using php.vim indent script (v1.40)
- Cleaned up a few braces here and there