Clean up args printing, condense code
Restructure, address doctests