Whole buncha stylistic improvements