Cobertura test coverage
Removing the redundant main method
Code cleanup
Notes regarding coding task