More code coverage and refactoring