more styling/restructuring