schema comment cleanup
formatting cleanup
fix defect #306