Added Underscore as a Dependency and cleaned up Code.