Clean up output
Un-hardcode username