0.0.6
Further cleanup of output