clean up more stuff per issue #41