Removing jQuery dep + small cleanup