Output is now formatted better