Changed formatting to be more efficcient