#135 Code style improvements