Updated the style and made fixes requested by Cornell