Misc. review clean-up