Fixing more style issues...