Streamline

Signed-off-by: Dan Scott <dan@coffeecode.net>
Refine refine refine

Signed-off-by: Dan Scott <dan@coffeecode.net>