more style issues addressed