Killed some overhead in calling jQuery and streamlined some code