Formatted output a little better