#133 Code review