address comment from lvh & lint