Removed unused required library
Refactored code to resolve #19