Final commit w/ some minor cleanup changes.