Changed printf statements to format better