Some more capitalization and polishing