Updated PreProcessor class and fortune data structure