Styling updates

Updated code to meet style requirements.