GPII-85_GPII-83: JSLinted and cleaned up