more style changes to be more in line with brownan's style