Additional cleanup

More cleanup for libraryness.