Small fixes with coding style and comments.