Clean up some methods
Add code coverage