Fixing style changes
Fixing mistye
Finalizing changes