Adding Cobertura code coverage tool/minor cleanup