Output formatting is now correct