VE-1196: Address jscs issues