minor aesthetic rearanging