cleanup, improve coverage