removed jQuery dependency and clean up