Capitalization cleanup