address styling feedback from Sara, naming and cleanup feedback from Nico; adjust tests