Applied some style fixes