#14 Change formatting to look better