Remove jQuery

Also, very minor code style changes