refactored capitalization fix into create flow