- Few coding style fixes