Cleanups and refactorings to increase coverage