Cleanup and better help output.