Removed some unnecessary jQuery-ing