Refactoring using Martini-Encoder