flip
minor clean-up