slight refactor
more fluent interface