Build instructions
Improved code coverage
Refactored