clean-up
Added chosen JS lib
small refactoring