Removed capitalize

- Removed capitalize
- Cleanup

TBR @ussuri