Cleaning up Behavioral - Interpreter