sample of refactor for fluent interface
add and fix more fluency
some more