make more use of extracted method, docblock