Refactor/Simplify case-transforming component