A whole lotta stylistic improvements