Few more small style fixes in general