Review some coding style after pull request #14 merge