Clean and test. (2.3.0)

Some minor cleanup and a bit of testing has been performed.