just some coding style fixes and very small changes