Improved Code Style

Small tweaks and edits to clean up the code without changing any
features.