coding style fixes / additions