Style changes

Updated to include all the requested changes.