#383 Fixed comments and coding style