Coding style review. Fix #7