Adding some style fixes