#133 code style improvements