Cleanup formatting and comments to reduce some noise