Added imports
Added match for values, Eq and fixed if.