Sorted some standards out