Preprocess module cleaned up