#71 Code style improvements