Revert "Applied a few changes"

This reverts commit a4c3af353c3952e82adc1e7598c513ee5f14e722.