Fixing interpreter code
Refactoring out redundant typeclass params