stylistic updates part 1, shuffling elements around