Address more style issues