All tests pass. Huzzah! + some minor cleanup.