Style Changes to make it look good
Fixing Merge