Refactor value converter