cleanup and test coverage