GPII-940 - Move Preprocessing, Cleaning Code and Adding Test