Refactor 3 more converters