Fixed recipe overriding and cleaned everything up