Comment Formatting and General Cleanup