Refactoring klass.c interfaces