Clean up comments, spacing, etc.