Bit of refactoring
Revert lower case codec