Moved to use sklearn preprocessing for scaling