Interfacify, clean up and refactor some stuff