Fixed some more style issues