Fixed formatting to be more consistent