JS hint cleanup/amends