WIP: Refactor capitalization