refactor, removing jQuery