re-organized to clean up output