#248: fix Coding style issues