Did some general cleanup.