Minor refactoring and condensing of different effect based classes into a single interface