Interface score + refactoring