See my changes regarding proper usage of classes/interfaces