[radu,alex] Removed unnecessary interface + minor refactorings