Changed feature engineering

I replaced my feature engineering by one from a tutorial I saw, its
more effective :)