100% coverage of libraries helpers
Removing commented out code
Initial refactoring of the Libraries Helpers