Addresses Kevin's suggestions, adds additional style updates