Improve capitalization