Tidied up Quill Interpreter

Change-Id: I0f58f594bc5d9318bf98cdc53bda0700f226da46