** Few additional style fixes