fixing more style issues