more cleanup / style fixes