Made simple refactorings.
Removed unused interface.